Reverting to Java style instead of Android style.

-- Line-break changes
-- Normal 2 and 4 space indents, not 4 and 8
-- Variables renamed to remove leading m