Merge \\\"Rename Android.soong.mk to Android.mk\\\" am: d044137cbe am: 17dda56f12
am: 375be57f16

Change-Id: I96a5f86e7b7b475b631ce99d84fc0bc74a9de9dc