Merge "test: enable javac/dx to import libcore on the bootclasspath" am: b96ed2c271
am: 8298166f99

Change-Id: Id835ba315a664b27778f1828970b222874423663