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

* commit 'f942f98352545c89d872656dc18f025493b3b04f':