Merge "Automated: Canonicalize spelling of Android-changed across libcore"