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

* commit '0477dce031cadff3f2b9d64fe35a3bd9afa8810f':
  Build NDK binaries with --hash-style=both.