Merge "Fix using kArm instead of kThumb2."