Merge "Use -Werror in packages/apps/Gallery2" am: 24309021fb
am: 5b7d5244e9

Change-Id: Ie45c3b38637a28be789d318c3c740c782f2131f2