Merge "Fix the Thumb-2 definition of the CLREX instruction."
am: d0288e2ac3

Change-Id: I982f6488d0709478ce87db8dab6ed5531c83db3e