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

Change-Id: I7b7fd5ad66ccef6de53be0eea37d78fddf0445b8