Merge "Follow installd API changes."
am: 915f279556

Change-Id: Ib362db25a0393e859909e06a00dbb0c655fd4b47