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

  - correction of errors with Javac 6:
    - fields accessibility of generic class.

Change-Id: Ice8a707450cd07f1c562c826af644153a30e8cfe
Merge branch 'cm-10.1' of github.com:CyanogenMod/android_packages_apps_Gallery2 into cm-10.1