Use our own Gallery2

Change-Id: I08e1dc3910e01033ee9785fcb472285f6dc17a8e