Merge "e2fsdroid: Correctly process the root inode" am: 702c28b202
am: 33cc4403b5

Change-Id: I5f0e07ab579f0cf5c5728a110f7e454fc2c9df60