Merge "EVS: Android.bp -> Android.mk"