Fix battery % always showing at < 100%

Change-Id: I9ce697e824e1f85becfd0e53519d3ae36fc65758
Make Status bar brightness control not default

Change-Id: I95115d794aef10c6e0d9514bf443cfab456b8c43
Merge branch 'cm' into HEAD