Bring inline with CM10.1

* Build fixes
* Updated some lib files