Android 6.0.0 release 4
Merge "Remove the platform version of libregex-re2."