Merge "system/core: use proper nativehelper headers" am: 4f59afe9fa
am: 6208cd1322

Change-Id: I74083b7169f03bbe347c8802c13cb6c9c7fad440