Fix broken build with LockClock
I hate dash clock.. Grab it from the play store if you love it so much
Merge https://github.com/LollipopIllusion/platform_manifest into lollipop

Conflicts:
	default.xml