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

Change-Id: Ieb4363909fa710b729493a361377576f666547e8