Gallery: fix several lint issues

CRs-Fixed: 1024516
Change-Id: Ia629e83e244fd1400b87edfefdba0b9a540d8153
3 files changed