am 9f17b1e1: Merge "Remove obsolete LOCAL_NDK_VERSION"

* commit '9f17b1e1a40076470c9e521b298ba29e771419dc':
  Remove obsolete LOCAL_NDK_VERSION