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

Change-Id: Ia308a4125cb483fac472225e2d40887465583e5a