am e4d787bf: am 7e793040: am eec11d97: Merge "Decouple platform compiler and NDK library versioning."

* commit 'e4d787bfbbde83bc4b868ed804c94118c2ea0080':
  Decouple platform compiler and NDK library versioning.