Merge "Fix more system/core/include warnings"