Merge "Use ABI_STRING."
am: ca7ce49ecc

Change-Id: I4be742799d7b160f802a27498e00c14896306fb4