Android NDK r21e (7075529)
Merge cherrypicks of [1543567, 1543568, 1543569, 1543744, 1543745, 1543764, 1543312, 1543570] into ndk-release-r21

Change-Id: I5cace7c075f0fc291c44512dcbba44d6a3a3a501