Merge "Fix static linkage in libcutils_trace_bindgen" into main