Merge "ART: Remove core-junit from test boot classpath"