Merge "Move ConnectivityTest apk to the sdk directory"