Merge "Move rewriting of references in OpenJDK source files to libcore" am: 9e9a777021 am: 43ab63fe75
am: 84e6f25e26

Change-Id: I1640854f836a5a38c02a7f675fba7aa7ac043361