Switch aosp tags to lollipop-release branch

Change-Id: I6eef0146c45b964c2574cbcab09908a404c00668
Fixed google-diff-match-patch repo fail

Conflicts:
       default.xml

PS2: Rebase

Change-Id: I5bc8c2e0a35cbe35002a2b303e75a2ec090c63b5
Chromium repos to AOSP

Change-Id: I22b7c053b5152ca63c3a96bcb184cfaee60d9d42
Fix

Change-Id: I55eb56bbc00295513dd899999bce0603518a35f1
Always something in manifest

Change-Id: I731bb7f443f975c8735890d5acd7c5c7672926b4
Merge remote-tracking branch 'upstream/L5' into L5

Conflicts:
	default.xml