Merge "Move common macros into bionic_macros.h."