Android O MR1 IOT Release 1.0.14 (5718152)
Merge "Convert external/neven/Android.mk file to Android.bp file"
am: b71d4e6acf

Change-Id: I7851f7abd3fd2cf3146e0c30909def07fdcf81de