Android O MR1 IOT Release 1.0.14 (5718152)
Merge "Convert Android.mk file to Android.bp"
am: 67b20324c8

Change-Id: I3f9c71108c865c6ee4ae13684ee4e052f7484ba8