Merge "x86_64: Simplify FlushIns"