Merge "Add support for logging complex events from C++." into pi-dev
am: 564e3581cb

Change-Id: I69736dce42800878f697c01e3253a33385df6a2b