Merge "Enable exporting the non-uapi scsi headers."
am: 6be65c135b

Change-Id: Id8c535cf060b6cb9f38efc70dcda43031f2375fb