Final

Made some base edits to the files, everything is now building properly for jellybean branch for CM10