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

Change-Id: Ic00e7b9ba3443b444528092b1e0fba62182fb25c