Merge "Conditionally remove android.test.base from bootclasspath"