am d480147f: am 7dc7f676: Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev

* commit 'd480147f1853e452e7e8fc4820db0e7821488289':
  Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS