status bar battery percentage: option for percentage inside icon
status bar settings: move brightness control to the top
redundant java edits
Merge remote-tracking branch 'upstream/lollipop-ras-mr1' into lp50x-test