Undo

Revert "jellybean"

This reverts commit a441a0de3f7bce4cb6f1eb73a79053e1da5e68b9.

Revert "Update prebuilts misc to use CM's"

This reverts commit 816681197edd4a0a8795762dfb61e9dcd848b346.