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

Change-Id: I135368c60665abb8e20fca554baef7e1031570c9