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

Change-Id: I30162fb6a20fecb7b7b24d86d6c302e41b3dc10a