Wrong product package: Gallery was replaced by Gallery2

Change-Id: Ia34e1fa9bc9ac494fac098eb86a5ddab78b6d149
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0