Merge "Allow prebuilts lib to be host_supported"
diff --git a/common/json/Android.bp b/common/json/Android.bp
index e7782d8..209f97d 100644
--- a/common/json/Android.bp
+++ b/common/json/Android.bp
@@ -12,8 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-java_import_host {
+java_import {
     name: "json-prebuilt",
     jars: ["json-prebuilt.jar"],
     installable: true,
+    host_supported: true,
 }
diff --git a/common/kxml2/Android.bp b/common/kxml2/Android.bp
index ee347b2..fde2192 100644
--- a/common/kxml2/Android.bp
+++ b/common/kxml2/Android.bp
@@ -12,10 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-java_import_host {
+java_import {
     name: "kxml2-2.3.0",
     jars: ["kxml2-2.3.0.jar"],
     installable: true,
+    host_supported: true,
 }
 
 java_import {