Android NDK r21 (build 6113669)
Merge cherrypicks of [1168368, 1168369, 1168370, 1168371] into ndk-release-r21

Change-Id: I4654a87adb5747a1fafde95d1ee923ec550ec951