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