Merge "Frameworks/base: Fix more warnings"