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

Change-Id: I1cbbdc465587f7ccd846993c4755790900b45034