tree 87bb8e48d5d435dbfdc15427b3516cfee323ac58
parent 6da16d51312894927cb74b3384212cd1899e83e3
parent 5aa278078ee593388123e1dedda6e9da06df5253
author Dan Albert <danalbert@google.com> 1529605594 -0700
committer Dan Albert <danalbert@google.com> 1529605594 -0700

Merge to upstream r334917.

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