Fix build Gallery2 am: a611ca04d2
am: a86c0f3f29

Change-Id: Ib297115644b34179601c24c2976f0f7ca3a51e19