Merge to upstream r296359.

This gets us to being only one year out of date rather than two
years. Can't do a full update just yet because the commit after this
one breaks exception handling for Android ARM. Updating this far
until that gets diagnosed.

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