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

Change-Id: I2ef3465b53d7fdbac1ec53bd6aead997234c2d4e