Lollipop bringup

Change-Id: I1761fe1cf1d648d9f87274fc2abeabf253b742b2
Squashed: Lollipop bringup 2/2

Change-Id: Ie122bcf513e554f4fbe386bac1fafb8d9bdd5032
Merge pull request #9 from AOSPA-legacy/lollipop

Lollipop