Pulling it back in with evervolv's and not changing common files. Builds -> No boot :(
Merge branch 'origin/jellybean-4.3'