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

Change-Id: Ica5c137675e14df28d1c1f70eba6b7788095629d