Corrected whitespace trespasses.

Many small whitespace mistakes slipped into the framework as the themes
feature was developed.  This patch reverts them to make a cleaner patch
set against android-2.3.1_r1.

Change-Id: I52223c1d572d4f013e37bebc5c11bb7b1c595eb3