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

Change-Id: I18c1381963c69b35bb8b518448040b4f607c30af