Merge "fastboot: Fix fastboot_vendor_boot_img_utils_test mac os compilation"...

Merge "fastboot: Fix fastboot_vendor_boot_img_utils_test mac os compilation" am: 18b6e9b8 am: c5d45ccb am: 7b5922de am: b4bc16e2

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2463156



Change-Id: I698fc8d054816698a317624bd72f6a72e97681c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>