Using my own system/extras project

Change-Id: I950644d7ccb1b3b7bdff77ff198d6114dc5b440f