[automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91 am: 69d914c57b am: 5c6df3c9a2 am: cd5dfa01ed skipped: 428866c804
am: 58265f83b2

Change-Id: I7b25a2885d197236a0ad8ccd6fe53f272a5fb3b3