am 17b8a7ae: Merge "Fix some incorrect IsCompiler instead of IsAotCompiler"

* commit '17b8a7ae501c2e55062db79c0ea538d9061e1ee6':
  Fix some incorrect IsCompiler instead of IsAotCompiler