revert "Squashed commit of installd changes"

This reverts commit 81876de13d04f6364ccb28b050e638d66f48c91d.

Change-Id: Ie48defa6e3e3147778f6cc3dcce167ab6b8b8f79