Combine two seperate .jscsrc files into one.

Also:
Some style tweaks
Change-Id: Ie3641ee6d19ab17025ad9c9e448d5bc1842083c5
Merge "Combine two seperate .jscsrc files into one."