rhine: reorganize props
rhine: merge of Sony 4.4.2 release

Change-Id: I606fd6fd5fffb541628679f2b13b4b4425ab34f8
Merge branch 'cm-11.0' of github.com:TheMuppets/proprietary_vendor_sony into cm-11.0