Merge "installd: only delete contents of user's CE and DE dirs"