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

Change-Id: Id17775ece2175390de16b0a4490d247828717e30