Better Wallpapers

Change-Id: Ieea66306ec85024fbd03f3370ed8504795cd732b
Merge branch 'cm-12.0' of https://github.com/OwnROM/android_vendor_ownrom into cm-12.0

Conflicts:
	config/common.mk

Change-Id: Ia01086919003c6578065c1ad82b6976d73cd3d0b