Use consistent storage type in bit structs. am: e4207a7bf5

Change-Id: I5181846e1041ccd20b8b930e80f098c12ed1d4d5