Merge "Frameworks/base: Remove unused header"