Merge "Revert "Revert "Exporting C headers from system/core""" am: 01678a0c84 am: e6588b4bfa am: 2d37a4ff16
am: 48f756e5aa

Change-Id: I4d63b6e6d4949fb06d60abf755cc9443fd46c23f