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

Change-Id: Id0b45ccfa8b762b4f17cb74f3144402c69e5cc50