Merge changes from topic 'libcutils_private_headers' am: 472808a570 am: 6c2d927c34 am: 2615527f08 am: 8a05dd0472
am: 70b8a597f0

Change-Id: I89b1455e6cdc9ec50ed4677e36068ed99f400776