am 330f808b: am f63ca1e9: Merge "Disable gnu style linker hash for NDK builds."

* commit '330f808b24dd3ee1b90bdd8b0e7e36ccca32e8b3':
  Disable gnu style linker hash for NDK builds.