Merge "Installd: Clean up installd" am: da86f5aa93 am: 3c8458247e
am: 265dae948f

Change-Id: I4e84e771681ac460001d6e1102d1435180df9968