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

Change-Id: I82bb9ca769fdc761a04a667c3c013a6f45fc5c03