Merge "Define current ABI string in android-base/macros.h"