Merge "Remove private headers from libcutils.vendor" into oc-mr1-dev am: b3ecb59163  -s ours
am: bf001682f0  -s ours

Change-Id: I79c0b81045a32607fb4cb61223d9912ca3f59847