Android CTS 6.0 Release 4
Merge "Remove the platform version of libregex-re2."