Merge "Fix dependencies of adt plugins to depend on the right prebuilts."