Remove extraneous files

Change-Id: I341bf5c3ea3650298bd59b16a75fee35de8c7e7f
Merge "Remove extraneous files" into cm-11.0