Merge "Clean up bionic_macros.h a bit."
am: 04164f6d05

Change-Id: Ice6ba027a4967df1e2276e3645738b53cd0f08f4