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

Change-Id: Iebd2832e27c2a666c5dacd5785fd2b453918e012