Legacy: Lollipop bringup

Change-Id: Ib0c429295ed8089e8049723136e29ebd9bcd42bf
Signed-off-by: houst0nn <houstonn@gmail.com>
Merge branch 'lollipop' of https://github.com/AOSPA-legacy/manifest into lollipop

Conflicts:
	default.xml