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

Change-Id: I4b812be109896a3574b1034033c163d8f2872e59