Merge "Remove ~1/3 of the installd calls at boot." am: 5bc305b97c am: d948865e27
am: e36f449c90

Change-Id: I818578f22a8988a141636694ae3811ad2d45f52e