Fix toroplus build.

Whoops... didn't commit this.
installd: Fix build.
Revert "installd: Fix build."

Rather than waste my time working on frameworks/base...

This reverts commit e771e6a7844794f610fd0364c6381c0a5f666c12.
Revert "[2/2] Speed up booting on multicore devices."

...let's just revert these for now.

This reverts commit 7fb7e4b784a60c61477ec4c646e1664c024da0f6.
Merge remote-tracking branch 'upstream/aosp-5.0' into aosp-5.0