Merge "ARM: Embed constants in add/sub-long."
am: 4997d14c8d

Change-Id: I0adf61fab5b5b17e29839542c6406d4e1fa5cc73