Fix compilation of Enum on JDK 7

Change-Id: I2e58b6a527e4ef1fc7ed3359b8aea88d01a031fb
Merge branch 'cm-10.1' into cm-10.1-openpdroid