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

Change-Id: I57aab2c41a737cdf61bd2217f3c630433f4e67d0