Switch aosp tags to lollipop-release branch

Change-Id: I6eef0146c45b964c2574cbcab09908a404c00668

Conflicts:
	default.xml