Merge "Add SIZEOF_MEMBER."
am: 1e4764e90c

Change-Id: Id5feb90cc9e8867b4ea3fd05bead333d385cfe9d