Revert "Crazy cleanup..."

Errors we didn't introduced should be left to minimize divergence from AOSP... rebasing on 4.3 or 5 will be impossible with these sorts of commits.
Please just clean files we've modified.

This reverts commit 1077a4ead4ae565c29119a728f893dca63a1a8e8.

Change-Id: Ifca65b3627baeab2a6fef710ccfe170e1966467d