Update AOSP GB branch for totoro