start to clean up and fix build for Cm10.1

Change-Id: Iff465f5b8cf4ed652fb9e60c1b0ca58bff4b0a61