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

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