Revert "Squash: Memory leaks, NPEs, races and optimizations for fw/base"

One of these files' change is a file mode change.
Another one's change is a whitespace change.
The rest are squashed together.

The days of monolithic squashes of fixes are past.
This is 4.4, not 4.2.

Thank you. Come again.

This reverts commit 623007a3e024d08dfa0c8f954d559e52d033f64d.

Change-Id: Ief736a6ed477e11d47da1d5acecc29cfcc810cbc