Manifest for Aosp master

Change-Id: I9eeb06e64b5fdeb1c10dd3cefc6ab20fe4b571e1