Fix build Gallery2
am: a611ca04d2

Change-Id: I569529ea748c770b12932ab2ec61a28c03dcbf4c