Fix build

Change-Id: Id20770f07977a06df86c486608625d9aad4c9361
Merge "Fix build" into kitkat-caf