Merge "installd: clear existing snapshots before performing a new one"
am: 0b643d5117

Change-Id: I8a481ad56250acaf90150ec3e1392fda40c8e0ba