Snap for 4598635 from 35912cf94b8213bbd6c06017684de671587b1b8a to pi-release

Change-Id: If634812c5f88b33cbf9ab2f2d6a2cec331f19172
diff --git a/Android.bp b/Android.bp
index 7136444..c1340d9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -20,8 +20,8 @@
     java_resource_dirs: ["res"],
 
     static_libs: [
-        "asm-5.2",
-        "asm-commons-5.2",
+        "asm-6.0",
+        "asm-commons-6.0",
     ],
 
     libs: [