Merge "Use -Werror in packages/apps/Gallery2"