Merge "Update makefiles for logging."

diff --cc graphics/allocator/2.0/Android.bp
index d6e88a3,df431ae..e26e9a3
--- 1/graphics/allocator/2.0/Android.bp
--- 2/graphics/allocator/2.0/Android.bp
+++ b/graphics/allocator/2.0/Android.bp
@@@ -41,9 -41,9 +41,10 @@@ cc_library_shared 
          "libhidlbase",
          "libhidltransport",
          "libhwbinder",
+         "liblog",
          "libutils",
          "libcutils",
 +        "android.hardware.graphics.common@1.0",
      ],
      export_shared_lib_headers: [
          "libhidlbase",

diff --cc graphics/composer/2.1/Android.bp
index 106a821,46c0d7c..a2e15f4
--- 1/graphics/composer/2.1/Android.bp
--- 2/graphics/composer/2.1/Android.bp
+++ b/graphics/composer/2.1/Android.bp
@@@ -49,9 -49,10 +49,10 @@@ cc_library_shared 
          "libhidlbase",
          "libhidltransport",
          "libhwbinder",
+         "liblog",
          "libutils",
          "libcutils",
 -        "android.hardware.graphics.allocator@2.0",
 +        "android.hardware.graphics.common@1.0",
      ],
      export_shared_lib_headers: [
          "libhidlbase",