Merge "Installd: Clean up installd"
am: da86f5aa93

Change-Id: I17553e106659ede717e277d4836a12972ef6b2a0