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

Change-Id: Iea5425e6ba48a2ee893348ccdc40d099b3cd1ef8