Merge "Better way to override NDK_TOOLCHAIN_VERSION at command line"