Merge changes from topic "keystorebp"

* changes:
  Convert lockregioncodeinjection to Android.bp
  Export AIDL for keystore Android.bp.

Android.bp

@@ -68,7 +68,7 @@ cc_library {
 
 subdirs = [
     "cmds/*",
-    "core/jni",
+    "core/*",
     "libs/*",
     "media/*",
     "tools/*",

core/java/Android.bp

@@ -0,0 +1,4 @@
+filegroup {
+    name: "IKeyAttestationApplicationIdProvider.aidl",
+    srcs: ["android/security/keymaster/IKeyAttestationApplicationIdProvider.aidl"],
+}

tools/locked_region_code_injection/Android.bp

@@ -0,0 +1,12 @@
+java_library_host {
+    name: "lockedregioncodeinjection",
+    manifest: "manifest.txt",
+    srcs: ["src/**/*.java"],
+    static_libs: [
+        "asm-6.0",
+        "asm-commons-6.0",
+        "asm-tree-6.0",
+        "asm-analysis-6.0",
+        "guava-21.0",
+    ],
+}

tools/locked_region_code_injection/Android.mk

@@ -1,15 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_JAR_MANIFEST := manifest.txt
-LOCAL_MODULE := lockedregioncodeinjection
-LOCAL_SRC_FILES := $(call all-java-files-under,src)
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    asm-6.0 \
-    asm-commons-6.0 \
-    asm-tree-6.0 \
-    asm-analysis-6.0 \
-    guava-21.0 \
-
-include $(BUILD_HOST_JAVA_LIBRARY)