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

Change-Id: Iaf9d7f9a3f7d2fd34a11ec2ee80d849fc7dd0078