Some changes added to compile and run with Java 6 and Java 7.

  - characters no UTF-8

Change-Id: Id365f85cae4d3c39d32a81fec200cdefb0a97f43
Merge remote-tracking branch 'origin/cm-10.1' into cm-10.1-linaro