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

Change-Id: I1c9c1fc7772beb4ce5f8ccfdb2f99e8f082f2627