Bring closer to stock AOSP until CM brings up the device tree
* Also add in changes from Andre (@ayysir)

Change-Id: I8747649afe6e55e1dcf455faaa821b4d664e0d2b