Revert "fix build - derp"

This reverts commit c954383a5d3e1575d31ae29a32586c26c2f05667.

Change-Id: I35f8c870da0f47626eed2855de63771591a7dd1c
Merge "Revert "fix build - derp"" into kitkat-caf