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

Change-Id: Ic07c2a734f0a634458d3c9e50b5877209434ef51