Android N IOT Preview 2 (NIG40)
Merge "Rename Android.soong.mk to Android.mk"