Merge "Build NDK binaries with --hash-style=both."
am: 30cb36ff5e

* commit '30cb36ff5e4834800a0c4694d0ccfe9759ffea83':
  Build NDK binaries with --hash-style=both.