Merge "libnetdaidl(_static) -> Android.bp"