Merge "Fix anonymous struct and union warnings"