Add libgtest_prod_headers.

Test: pass
Change-Id: Ie7fe62f2003f55abe89957c4de5e73a4b857831e
diff --git a/googletest/Android.bp b/googletest/Android.bp
index 47ef71c..6e521a5 100644
--- a/googletest/Android.bp
+++ b/googletest/Android.bp
@@ -86,8 +86,8 @@
     defaults: ["libgtest_host_defaults"],
 }
 
-cc_library {  // TODO: make this a cc_library_headers module
-    name: "libgtest_prod",
+cc_defaults {
+    name: "libgtest_prod_defaults",
     defaults: ["libgtest_defaults", "libgtest_host_defaults"],
     host_supported: true,
     native_bridge_supported: true,
@@ -103,4 +103,15 @@
     min_sdk_version: "apex_inherit",
 }
 
+// Deprecated; use libgtest_prod_headers instead.
+cc_library {
+    name: "libgtest_prod",
+    defaults: ["libgtest_prod_defaults"],
+}
+
+cc_library_headers {
+    name: "libgtest_prod_headers",
+    defaults: ["libgtest_prod_defaults"],
+}
+
 // Tests are in the Android.mk. Run with external/googletest/run_tests.py.