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

Change-Id: I61ecfc1ff6f0f94a297db4e8661d6c2e2eefad53