Merge "Fix Android SDK toolchain definitions in preparation for updating the Bazel Android Rules."