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

* commit 'bfaf8d2640896348f94570e74d1b1f2f60f7a36b':
  Fix circular dependencies for ContainsBootClassLoaderNonImageClass