Merge "Re-enable android.cts.compilation.AdbRootDependentCompilationTest#testCompile_curProfile" into oc-dev