Updated for M7 GSM versions

Change-Id: Ia320e4263e4640e453897264be85381fea0b2d5b
Merge branch 'lollipop' of https://github.com/TeamHorizon/vendor_xenonhd into lollipop
more M7 updates
Conflicts:
	proprietary/m7/media/bootanimation.zip

Change-Id: Iad862c407e72d1b163a46537d0095e8d8d381324