Merge "Convert external/neven/Android.mk file to Android.bp file" am: b71d4e6acf
am: 28adb05bcc

Change-Id: I0a338b721d724aa31d1ae6d1c7b4c1ecc1329c72