Merge "Add new Android.mk to handle repo move"