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

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