Merge "Build NDK binaries with --hash-style=both."