There are some cyanogenmod things messing up the build  this commit fixes all cm artifacts that are remaining

Change-Id: I338561f0904610f1edbb1ec1d1a40b2c649006ef