Workaround weirdness when running on Intel devices

Happens when Proguard optimizations are enabled,
so it seems like a mix of Proguard and Intel ABIs
results in wrong outputs.

Fixed by going back to the standard shift logic
rather than our more complication mult.

Test: none, although this is reverting an earlier change
BUG: 32407053
Change-Id: I811018c3714cb7cd02e70dacc24014c1ff09dd3f
1 file changed