am 7d63d0ed: am f942f983: am 20b68712: Merge "Fix empty struct C/C++ compatibility issue."

* commit '7d63d0edc541747cfec198490c61cc18c70c30b4':