Merge "installd should be fully developed in AOSP."
am: 1b73cc2b39

Change-Id: I3b16b6f44a8b9544fdbdf227d6e6d4f5d5aacd19