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

Change-Id: I73c250c360db22f7bb8a5e6d3c32c023a846cb39