Merge "QcomModulePkg: Fix the different type sizes and base types warnings"