am 2433d1a1: Merge "ARM: Fix LIR flags in encoding map."

* commit '2433d1a12dadb90a1b1c1140156aaf72f5b52c5e':
  ARM: Fix LIR flags in encoding map.