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

Change-Id: Ia9406884d17226b10cae21fd2d98eecb9e5e7253