Changes to get camera/ril working (Thanks Kushdeck)