Update Lollipop branch
Fix boot issue by correcting partition sizes