try aosp
Merge github.com:Dm47021/b2g-manifest

Conflicts:
	arthur.xml