Merge "Remove ~1/3 of the installd calls at boot." am: ed04f3c7e5
am: 3f79c64976

Change-Id: I20e68b8a24f2242160110df51d673d18a127d64e