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

Change-Id: I0696c3a6f00334ac1b48bb8c8e19601e17be5537