Merge "CTS: Remove JDK internal class usage from JavacBuildStep" am: bc15036e23 am: 6572fe5e1d
am: b11dd7a88a

Change-Id: I697b80d70a76970ecb6c591b76a8fc1655c3f52d