am 0995ac8a: am deafb56c: am 014369d5: Bring Gallery2 manifest into parity with CROP support

* commit '0995ac8ab3d5be9db6fa819ae215da5f70303e5e':