Bug: 37647680, 37648355 Test: compile, manual Change-Id: I5aaf07dd76d0d8f5294fb4133c7a0b5e6df3bebc
Ensure the last member of structs is actually the one we expect Change-Id: Ib623f1a5e09fd9b8d464456528a94742b0ccd00b