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