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

Change-Id: Ia6af8d920971118f108320d08b15cbe3da59b28a