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

Change-Id: I8a4c7809e61670da27f67f9301243a7acf9dc7ce