Merge "Re-enable test 496-checker-inlining-and-class-loader with CC."