Squached commit of updates for kitkat

* Fix framework res config override
* Sensors struct fix

Change-Id: I8749395878559d20980d57e259de6b04bb753aa4