Merge "Merge cherrypicks of [1168368, 1168369, 1168370, 1168371] into ndk-release-r21" into ndk-release-r21