Android n mr1 preview 1
Merge \"Rename Android.soong.mk to Android.mk\"
am: d044137cbe

Change-Id: I4f97ae2f54cd271f3a9acbb16649a41b62d342c4