Merge "Convert external/neven/Android.mk file to Android.bp file"