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

Change-Id: Ib47af126fbb69b4d6ef28ea11ebac09cdbf2a27b