Android CTS 6.0 Release 31 (4890202)
Merge "Remove the platform version of libregex-re2."