Merge "Statically link aidl libs into netd_unit_test"