Merge "Installd: Introduce otapreopt"