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

Change-Id: I91587cb71e23d1149b2d8731797c94df58674faf