Merge "Revert "Fix decodes on 64-bit devices built with clang-3.8""