tree 773d5e3500cc083151aa06c8229d0d784000c29c
parent 54c0fde9f36dfda5cd2c2c4fb60e3ece81b339c6
parent 793cbb6c300288d1078eff263d99eb0e3dba1105
author Elliott Hughes <enh@google.com> 1570635922 -0700
committer android-build-merger <android-build-merger@google.com> 1570635922 -0700

Merge "Restore __ANDROID_NDK__." am: ee15585029
am: 793cbb6c30

Change-Id: I64caa5e41f4d7d8456de3c96bed020f4af9ba996