Merge "Add a metadata folder for libsnapshot." am: 45a1c998d1
am: f1ce0e51bb

Change-Id: Icd9a9ee21accb3cc6c79f30efe2f4af753b4a51b