merge aokp changes and remove unneccesairy devices