am 8afa2555: Merge "Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib"

* commit '8afa25552efb51286fe0f010f0bf78fea71fc12a':
  Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib