Move misc.cpp to the right place and fix build

Change-Id: Ib393ff4ac6300e73737a04ae7f8e9915490b09ce
2 files changed