Merge "e2fsdroid: don't print empty files in block_list.c:end_new_file" am: 43ff4cf0d8
am: dd62d63cd1

Change-Id: I44a9335693be5300560c6f02f71893633e11d8b3