Merge "Move rewriting of references in OpenJDK source files to libcore" am: 9e9a7770 am: 43ab63fe am: 84e6f25e Change-Id: I1640854f836a5a38c02a7f675fba7aa7ac043361