Merge "Remove unnecessary type and dup for fd" am: 5428551ba9

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1374049

Change-Id: I56da62cf488530f40a79e7de339817fbeb23c13b