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

Change-Id: I49b87b72fa204930fe4e4a6e7d65586f76d13a6a