Merge "Follow installd API changes." am: 915f279556 am: 6b662722f0 am: 5e17fe3e8c
am: f52972ad8b

Change-Id: Ib22fb4e87944824a64faf93667181a8bc56098ef