Merge "Revert "Exporting C headers from system/core""
am: 22b7f76a00

Change-Id: I26ce7c7ec89f020d55ba0fc35d8d298106d976d3