Merge "Revert "Revert "Exporting C headers from system/core""" am: 01678a0c84
am: e6588b4bfa

Change-Id: I420c3209c8f6fdca53da56dd8e2a2aed3ad5591e