Merge "bionic: add macro protection for MALLOC_ALIGNMENT"