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

Change-Id: Idefb550cc541e6e59c2d208b9c08fa110636def5