Merge "Fix some incorrect IsCompiler instead of IsAotCompiler"