Bringing the Android kernel back to the mainline