Remove moto-x bionic portion