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

Change-Id: I5b1cbe0ea74171340cbfd46d8f8fe4cbf6d2578e