Android NDK r23b (7779620)
Merge cherrypicks of [1836035, 1836036, 1836037, 1835944, 1835945, 1836015] into ndk-release-r23

Change-Id: I63d3924f665311d97245fe968c9c0b5b35223ab9