Merge "Fix anonymous struct and union warnings"
am: 87e72cb237

Change-Id: I1ace0ad7d2f175b6d6cc42a0ce6845c76ba032b3