Android CTS 6.0 Release 31 (4890202)
Merge "Add glibc2.15-based host toolchain."