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