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

Change-Id: Ic183a3034a6d461e53182c97527e9ff06747ddc3