Resolving merge conflicts with AOSP upstream -more