Merge "Enable clang builds of mips/mips64 in bionic again."