Merge "Exporting C++ headers from system/core" am: 812b7d5d52
am: f484dd3401

Change-Id: I1c60ff535ef1e11cfca8ff942bf6c2fd11313ede