Android: Pull our own Gallery2

Change-Id: I6284bf23d9d31daa0f78d75bd3f0b9d7407672ed