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

Change-Id: I23b96f14ce8e05a3ab36b7c32a29026f4f08ef60