Merge "Fix empty struct C/C++ compatibility issue."