Merge "Exporting C headers from system/core" am: 897bc9b2b3 am: e6464ca571
am: e7bbb3c4b0

Change-Id: Ib375d8db61b1fddbb0c0627ae95d3cac5402821b