Merge "HCI: Use fixed-width types"
am: 81aa71744a

Change-Id: Iabb16df2d3dc46067ab919fd05137a6cabc56552