am c7ceaa79: am 9f17b1e1: Merge "Remove obsolete LOCAL_NDK_VERSION"

* commit 'c7ceaa791d6388ff9cf64740e3afc92c50b7ec03':
  Remove obsolete LOCAL_NDK_VERSION