Merge changes from topic 'libcutils_private_headers' into oc-mr1-dev am: a23145f901 am: 59d7282b53
am: a6eb2be6b8

Change-Id: I2c4e9ee22f8e81f6439463dcfe6c97ee0910910e