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

Change-Id: I03bf66d142a5352e9d496777c696d34d1f91193d