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

 * Breaking build on Linux Mint with OpenJDK 6.
   http://pastebin.com/zciG3W68

This reverts commit 85e22e7ff8f2c3d925b645a88f9b1410307d0f95.

Change-Id: I438c4281654fcb66a317883302527bde3c560125
Update android generator to handle java7.

This is a combination of several commits made
to these files:

https://chromiumcodereview.appspot.com/23587011
https://codereview.chromium.org/23702057
https://codereview.chromium.org/40523002
https://codereview.chromium.org/49913003

Change-Id: Id944decfde8590c3a6e548ac66f598c45de7169e
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0