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

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