Merge "Installd: Refactor in preparation for OTA"