Revert "Revert "Merge branch 'lollipop' of https://github.com/INFAMOUS-LOLLIPOP/android_vendor_infamous into lollipop""

This reverts commit d7753a68443b7835d36d7109e24f581468adef51.

Conflicts:
	config/common.mk
	sepolicy/file.te