Merge "Fix circular dependencies for ContainsBootClassLoaderNonImageClass" am: 319362870b am: bfaf8d2640
am: a7dda0c980

* commit 'a7dda0c9806d05e83ec209ef0a75c502b5ae7b66':
  Fix circular dependencies for ContainsBootClassLoaderNonImageClass