Merge "Fix Thumb2Stm, ldm definition of EncodingMap for arm"