Merge "Convert hostsidetests/edi/Android.mk file to Android.bp"