Revert "Some changes added to compile and run with Java 6 and Java 7."
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

ThirdProject/android_external_chromium_org,mkaluza/external_chromium_org,mkaluza/external_chromium_org,VanirAOSP/external_chromium_org,VanirAOSP/external_chromium_org,MyAOSP/external_chromium_org,MyAOSP/external_chromium_org,ThirdProject/android_external_chromium_org,ThirdProject/android_external_chromium_org,Epirex/android_external_chromium_org,MyAOSP/external_chromium_org,ThirdProject/android_external_chromium_org,katstalk/android_external_chromium_org,scotthartbti/android_external_chromium_org,temasek/android_external_chromium_org,VanirAOSP/external_chromium_org,temasek/android_external_chromium_org,scotthartbti/android_external_chromium_org,ThirdProject/android_external_chromium_org,VanirAOSP/external_chromium_org,TEAM-Gummy/platform_external_chromium_org,MyAOSP/external_chromium_org,temasek/android_external_chromium_org,Epirex/android_external_chromium_org,mkaluza/external_chromium_org,scotthartbti/android_external_chromium_org,androidarmv6/android_external_chromium_org,MyAOSP/external_chromium_org,scotthartbti/android_external_chromium_org,MyAOSP/external_chromium_org,MyAOSP/external_chromium_org,ThirdProject/android_external_chromium_org,scotthartbti/android_external_chromium_org,VanirAOSP/external_chromium_org,ChronoMonochrome/android_external_chromium_org,temasek/android_external_chromium_org,katstalk/android_external_chromium_org,androidarmv6/android_external_chromium_org,mkaluza/external_chromium_org,TEAM-Gummy/platform_external_chromium_org,katstalk/android_external_chromium_org,katstalk/android_external_chromium_org,ThirdProject/android_external_chromium_org,ThirdProject/android_external_chromium_org,katstalk/android_external_chromium_org,scotthartbti/android_external_chromium_org,TEAM-Gummy/platform_external_chromium_org,ChronoMonochrome/android_external_chromium_org,ChronoMonochrome/android_external_chromium_org,mkaluza/external_chromium_org,TEAM-Gummy/platform_external_chromium_org,TEAM-Gummy/platform_external_chromium_org,Epirex/android_external_chromium_org,TEAM-Gummy/platform_external_chromium_org,ThirdProject/android_external_chromium_org,VanirAOSP/external_chromium_org,temasek/android_external_chromium_org,ChronoMonochrome/android_external_chromium_org,androidarmv6/android_external_chromium_org,androidarmv6/android_external_chromium_org,temasek/android_external_chromium_org,VanirAOSP/external_chromium_org,temasek/android_external_chromium_org,Epirex/android_external_chromium_org,katstalk/android_external_chromium_org,androidarmv6/android_external_chromium_org,androidarmv6/android_external_chromium_org,ChronoMonochrome/android_external_chromium_org,androidarmv6/android_external_chromium_org,MyAOSP/external_chromium_org,katstalk/android_external_chromium_org,scotthartbti/android_external_chromium_org,katstalk/android_external_chromium_org,VanirAOSP/external_chromium_org,Epirex/android_external_chromium_org,Epirex/android_external_chromium_org,androidarmv6/android_external_chromium_org,Epirex/android_external_chromium_org,mkaluza/external_chromium_org,ChronoMonochrome/android_external_chromium_org,ChronoMonochrome/android_external_chromium_org,TEAM-Gummy/platform_external_chromium_org,TEAM-Gummy/platform_external_chromium_org,TEAM-Gummy/platform_external_chromium_org,mkaluza/external_chromium_org,Epirex/android_external_chromium_org,scotthartbti/android_external_chromium_org,mkaluza/external_chromium_org,MyAOSP/external_chromium_org,mkaluza/external_chromium_org,ChronoMonochrome/android_external_chromium_org,ChronoMonochrome/android_external_chromium_org,katstalk/android_external_chromium_org,temasek/android_external_chromium_org