Merge "Define current ABI string in android-base/macros.h" am: 2732a7e023
am: d98e5fc543

Change-Id: Ic2832ccb89ad438d5af03024161d85a0d400c90f