Merge "Move rewriting of references in OpenJDK source files to libcore"