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

Change-Id: Ia78e850305b0307ae56dd63b945e6d412fbbc9fb