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

Change-Id: Iab7de4b15270e4c0dd53fba63230799d0c56a088