Merge cherrypicks of [2137996, 2137997, 2137998, 2137999, 2138172] into ndk-r25-release.

Change-Id: I4ad5954495c55fb40954015ba011f0ab6d5f4a54