Merge "ARM/VIXL: Fix TypeConversion of large long constants to int." am: 111eefd043
am: 9eaaacba7f

Change-Id: I0744d5236ac29a46dd32e8df65543723cca24342