Merge "ODR violation in resize2fs during host build"
am: 89664d7f8b

Change-Id: I3452ef54ad63a148d6607f8ee38e1e37c71b54eb