Revert to use bionic from CM10.2