Merge "Rename Android.soong.mk to Android.mk"
diff --git a/Android.soong.mk b/Android.mk
similarity index 100%
rename from Android.soong.mk
rename to Android.mk
diff --git a/libc/Android.soong.mk b/libc/Android.mk
similarity index 100%
rename from libc/Android.soong.mk
rename to libc/Android.mk