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