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

Change-Id: Iecd9d1b0b6a22d48a1cac59e028f7d31b50a3e3e