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

* commit '319362870b67f1bf19c432ff24d5bcc328e65994':
  Fix circular dependencies for ContainsBootClassLoaderNonImageClass