Merge to upstream r334917.

Test: ndk/checkbuild.py && ndk/run_tests.py
Bug: None
Change-Id: I0ec4d4cdaa80aa4879290bd96a69f28a12fbcb98