Merge cherrypicks of [1163480, 1162728, 1163481, 1163482, 1163460, 1163461, 1163462] into ndk-release-r21

Change-Id: Ia6d775a72e4c05ce6987b814c81d96b1ea46dc9f