frameworks/base: Fix merge conflicts