Merge "e2fsdroid: print used/total inode and block count" am: 2076f7feda
am: fd37c3b4c4

Change-Id: Iaceee8fce4cd89286faf41b94a82f868559acb62