Merge "Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib"