Merge "installd: remove restored ce_data if de_data rollback failed"