Merge "Rename Android.soong.mk to Android.mk"