Merge "libsnapshot: Add EnsureMetadataMounted" am: 2c74292038
am: a49b7e9d56

Change-Id: I80ddfe796c3c3e6be61dd39ec52621a2fdba87c4