Squached commit of updates for kitkat

* Fix framework res config override
* Sensors struct fix

Change-Id: I8749395878559d20980d57e259de6b04bb753aa4
Commit Changes

Change-Id: I90c9165c2be3e0c3b5cfeaf97e18b1e88f226df3