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

Change-Id: If306d493ca2ffac4178f2b01ba1b539926d07868