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

Change-Id: I218819c51271db63d6ecbc1e5ac51674bfd6fc4a