Fix ALL the errors in Eclipse

 * Fixups for new projects.

Change-Id: I7fbd7bb555c9893cfafb6c5da4ba0d1ba5af4a48
Merge branch 'cm-10.2' into martincz