am 449d4634: Merge "bionic: add macro protection for MALLOC_ALIGNMENT"

* commit '449d4634bea0ff8f6b29a2826871279dd654f941':
  bionic: add macro protection for MALLOC_ALIGNMENT