Merge "Remove service/native/include/Common.h" into main