Merge cherrypicks of [1304374, 1304375, 1304376, 1304377, 1304378, 1304379, 1304380, 1304381, 1304382, 1304383, 1304384, 1304385, 1304453, 1304454, 1304473] into ndk-release-r21

Change-Id: I54ea0369518c61d6e336af90933c3b428a0cf35d