installd side of the change. bug:37929796 Test: build (cherry picked from commit bad623a2) Change-Id: Ice855d20184443a641e081efa4ec943326ccefdd