Typo in manifest

From AOSP

Change-Id: I123f7d8a2b30337e6224aba1e0fd6d78a24d5233
Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1

Conflicts:
	Android.mk
	AndroidManifest.xml
	src/com/android/gallery3d/filtershow/FilterShowActivity.java
	src/com/android/gallery3d/filtershow/ui/ImageCurves.java

Change-Id: I8e29f03fbb5de003e97f7180e287661bd9142a97
Gallery2: Refactorize Pools class

Move Pools to other package to avoid the conflict name with the
frameworks base one, which has a different implementation.

Change-Id: Idbe79773232a957a1ef230326a142e126eebb8b4
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Gallery2: isoc++11 fixes:
  - Fixed in-class constexpr handling
  - Fixed invalid conversion from 'int' to 'ImageType {aka unsigned char*}'