Make compilable in-tree

FPIIM-1291

Change-Id: I7ef119efd2f322f00f5ada37d461bc265634b622
3 files changed