am 70074773: am 182f33db: am 8cf2ce10: Merge "Don\'t allow SUPPORTED_ABIs to be set by the native bridge."

* commit '7007477391d78c6f4823ef35490e67f75ddaced9':
  Don't allow SUPPORTED_ABIs to be set by the native bridge.