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

* correction of errors with Javac 6:
- target 1.5 and source empty.

Change-Id: I10dce12261b96a421923d775bea9f2eeac8638cf