Merge "Add installd method to delete CE snapshots." am: 4ce8b0dd93 am: 4c804198a4

Change-Id: I097571c0b0e7413a10d207c1b95324eec5cde76e