Merge \\"Use compiler-rt\\'s unorddf2 for x86_64 and arm64\\" am: 1d648e59f2
am: e7a72ac33e

Change-Id: I186908ad75d31f79e729b2345409da9508fadf0e