Merge "ARM: Fix LIR flags in encoding map."