Merge "Revert "Revert "Exporting C headers from system/core"""