Merge "Remove private headers from libcutils.vendor" into oc-mr1-dev