Merge v0.6.0 into master.

Adjust Android build system rules for recent changes in upstream
cpu_features.

Test: lunch aosp_arm-eng \
        && mmma external/cpu_features \
        && atest --test-mapping external/cpu_features:all
Test: lunch aosp_arm64-eng \
        && mmma external/cpu_features \
        && atest --test-mapping external/cpu_features:all
Test: lunch aosp_x86-eng \
        && mmma external/cpu_features \
        && atest --test-mapping external/cpu_features:all
Test: lunch aosp_x86_64-eng \
        && mmma external/cpu_features
Bug: 169921883
Bug: 128901000
Change-Id: I5fa712b4ea6e52f60128fb0c907a52cd894f34f1
diff --git a/METADATA b/METADATA
index 728702c..5e2b871 100644
--- a/METADATA
+++ b/METADATA
@@ -9,11 +9,11 @@
     type: GIT
     value: "https://github.com/google/cpu_features.git"
   }
-  version: "v0.5.0"
+  version: "v0.6.0"
   license_type: NOTICE
   last_upgrade_date {
     year: 2020
-    month: 9
-    day: 22
+    month: 10
+    day: 15
   }
 }