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

This reverts commit 43096a21ef56a038adf85918487978d16a9f6dca.

Bug: http://b/25981958
Bug: http://b/25845393
Change-Id: Ic026dd111247746fc6eb4b368da278d637276eef
2 files changed