Gallery: Removed "Settings" item from menu. (GallerySettings are empty)

As soon as GallerySettings.java has content, comments should be removed
from the files that this commit changes.
Menu without "Settings": http://i.imgur.com/gOX7x.png

Patchset2: Reverted AlbumSetPage.java changes

Change-Id: Idf8157849f9f394100ef858f4947e3f6cb734a93
Gallery: Removed "Settings" item from menu. (GallerySettings are empty)

Fixed Build Error from previous patch

Patchset2: Minor comment fix

Change-Id: Idf8157849f9f394100ef858f4947e3f6cb734a93

Conflicts:
	res/menu/albumset.xml
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 remote tracking branch 'cm/cm-10.1' into jb-4.2

Signed-off-by: travp624 <travp624@gmail.com>