Merge "Use remote_api for shell access on developer.android.com." into froyo