Fix build for Nexus 5 (hammerhead) and gcc-4.8+

Signed-off-by: Paul Beeler <sparksco@gmail.com>