Merge commit 'bf46871b35f3a2a807705766490e19a537d1c44e' into HEAD

Change-Id: I0efdb5a7e67d8666afd6e470b7d8285091a6ecfb
diff --git a/core/Android.bp b/core/Android.bp
index 094281e..bf6d343 100644
--- a/core/Android.bp
+++ b/core/Android.bp
@@ -14,6 +14,10 @@
 // limitations under the License.
 //
 
+subdirs = [
+    "tests",
+]
+
 cc_library_static {
     name: "libnvram-core",
     host_supported: true,