Merge \"Add new Android.mk to handle repo move\"
am: ab95c4a59d

Change-Id: I435c234381c051846e78b2b1a7e305aa69918055