Merge "manifest: fix branch for android repo" into android-8.1