Merge "Fix circular dependencies for ContainsBootClassLoaderNonImageClass" am: 31936287 am: bfaf8d26 am: a7dda0c9 * commit 'a7dda0c9': Fix circular dependencies for ContainsBootClassLoaderNonImageClass