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

Change-Id: I31b240285ad392112d78fa07384a011f0736f1c7