Merge cherrypicks of [1600733, 1600734, 1600735, 1600736, 1600737, 1600738, 1600674, 1600675, 1600455, 1600456] into ndk-release-r22

Change-Id: Ifd75a85cc439aef9fb9426e077ec0d9f756c049d