am 9fbd3afd: am 431b4bb3: Merge "Extend the CPU ABI specification mechanism."

* commit '9fbd3afdecc2fee211c11a6aedb39422fa8dd773':
  Extend the CPU ABI specification mechanism.