Merge \\"Rename Android.soong.mk to Android.mk\\" am: b07df4dd3f
am: 68bfe51348

Change-Id: I49b87b72fa204930fe4e4a6e7d65586f76d13a6a
diff --git a/debuggerd/Android.soong.mk b/debuggerd/Android.mk
similarity index 100%
rename from debuggerd/Android.soong.mk
rename to debuggerd/Android.mk
diff --git a/liblog/Android.soong.mk b/liblog/Android.mk
similarity index 100%
rename from liblog/Android.soong.mk
rename to liblog/Android.mk