Merge "Replace GalleryNew3D with Gallery2 in AOSP."