Merge "ODR violation in e2fsck during host build" am: 1697f66478
am: 21dc8eee1a

Change-Id: Ic04f5b25f06f6ab3b3b22692df519a565d27e17a