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

Change-Id: I3f78e605afb7184dbb4fcc4416e61af98d1fded1