Merge "Add metadata_csum in ext4.h" am: 252c7e15d4 am: 774e00fb7f

Change-Id: If862bfc2e2d0aaea065c67eb35077d761064f877