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

Change-Id: I4bb756851890043770a40a115df6fc5664af4a1b