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

Change-Id: I29f8a99763645b2cf77cc68d91d21fc4919b92f5