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

Change-Id: Iec882319f93d829c4721bbeec852f5eafdec538d