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

Change-Id: If2dc2da283db7a60f478c6e61a9e9b32edb42ce7