Merge cherrypicks of [1167933, 1167888] into ndk-release-r21

Change-Id: I28aeaaf04adf1441482a0dbfa05c770adbd5972e