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

Change-Id: I486fcbbe64b2eaaeb281fd4fba64933ee914c82e