Merge "Convert hidl_bitfield and bitfield to int"