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

Change-Id: Ide3234a2e87831bd8f735e16d6a9098cad2ffff4