Merge cherrypicks of [1949776] into ndk-release-r23.

Change-Id: I024247a8a3e399283ec1fba7d7782d0fc82a7762
tree: d82c84c3120751035aebc6fd5151e0ebdb2bd385
  1. bin/
  2. doc/
  3. share/