start to clean up and fix build for CM10.1

Change-Id: I97582000972d85d9ddb822e0ce59b4b25ce65de3