Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master

No content change.

Bug: 135460123
Change-Id: I796b11d51ecde1ec1b1b439bc14c9aec5eaf4e5c
Merged-In: I960e9c58447f384c429b4234cc298946c87a6e55
diff --git a/Android.bp b/Android.bp
index 46d7cc2..8c67c9b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 cc_binary {
-    name: "iperf",
+    name: "iperf3",
     srcs: [
         "src/*.c",
     ],