Gallery2: Remove aapt warnings

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