Merge "Fix google-explicit-constructor warnings in ext4_utils." am: e2d0366442  -s ours
am: dab4f37b48

Change-Id: I1f7f2be9fc0817fa7ccc4211d9daa38d4042efc3