Merge branch 'cm-11.0' of github.com:CyanogenMod/android_build into cm-11.0

(cherry picked from commit 10eee7b4566d2d4685238958807375e09e81204c)
Wrong product package: Gallery was replaced by Gallery2

Change-Id: Ia34e1fa9bc9ac494fac098eb86a5ddab78b6d149
(cherry picked from commit bce2bf9656befa867298c8e4c517902b176a574e)