Merge "Revert "Fix decodes on 64-bit devices built with clang-3.8"" am: 9952695a90
am: 530260ea5d

Change-Id: I241dd2de95483dc350a35215f803f24edf37565e