Merge "Fix __builtin_prefetch" into ng/master