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

Change-Id: Ia8b20612de2e1adb541a0e6a099f7477adcdb4a9