Update deps for lollipop

Change-Id: I403c3d31c1e45792e89aa1577eb33d39cfa7c80a