change kernel back to aosp until conflicts are tracked down