Android 6.0.1 release 30
Merge "Remove the platform version of libregex-re2."