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

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