Merge "Convert hostsidetests/edi/Android.mk file to Android.bp"
am: 20d74b4ac1

Change-Id: I04b400e4102d6c97baf874556b4229b4ac64f716