Merge "Exporting C headers from system/core" am: 897bc9b2b3 am: e6464ca571 am: e7bbb3c4b0
am: 561ac663a3

Change-Id: I87fcb2ac64d9646093e34ba5c67ab9747e2e66fb