Revert "TEMP build fix for hammerhead"

Fixed by: http://review.cyanogenmod.org/#/c/74880/

This reverts commit 152bef42c00d6e06a45f5ca6f2bad85989bf2a55.

Change-Id: Ib49f7e929ee34aae1ebbe22537fa9a524300e849