Merge RP1A.190923.001

Change-Id: I75b6592c586f73e969a754a511c6cb5ef519943e
diff --git a/Android.bp b/Android.bp
index 0687b19..57045cf 100644
--- a/Android.bp
+++ b/Android.bp
@@ -51,7 +51,7 @@
     },
 }
 
-cc_library_shared {
+cc_library {
     name: "libpiex",
     host_supported: true,
     defaults: ["piex_default_cflags"],