Merge "Merge cherrypicks of [1201618] into ndk-release-r21" into ndk-release-r21