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

Change-Id: Iaaf7a3b5f4be7669b6ddaeac782db335205c14da