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