Merge "Revert "Exporting C headers from system/core"" am: 22b7f76a00 am: 16aac283f4 am: ebc9f4eb58
am: 061ed4de3e

Change-Id: Ic5d71373b0a84dd4bcf75acbc0e745ca4f99de3c