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

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