Merge "Revert "Update ADT bundle to use Juno packages""