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

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