Merge "ioshark: fix headers" am: 4ae07e6c71

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1474716

Change-Id: I879b9952f572e06eb1f6add8de44468640b2c553