init: fix indentation and tab

Change-Id: Ia832ab4df5d955b2fa2b791baf9444aca21c2571
init: provide initial pemissions for ondemand governor

also set all governor permissions a bit late

Change-Id: I5c1445b31bcaf34a535efd7438fd612ada460ea2
Merge "init: provide initial pemissions for ondemand governor" into cm-10.1
Merge branch 'cm-10.1.1' into martincz
Merge remote-tracking branch 'mokee/jb-mr1_mkt' into HEAD