Revert "try using cm bionic for now"

This reverts commit 4bee0b802f705e4cbfe12f7ae53fb9ce6961295e.