Edit dependecies for Lollipop

Change-Id: Ic393c79b30bd272ed289f9f8314eb2b7e38d3cde