merge lollipop branch of aospa-legacy into lollipop
change cm and pa vendor to venture