Merge branch 'master' of persistent-https://googleplex-android.git.corp.google.com/platform/libcore into merge-goog-master-to-aosp-master