Merge "sdm: Changes to support clang compatibility"