Merge "Fix API for C compatibility" am: 6f3e974ab5

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1408797

Change-Id: I0aaa7ab7ceb9e0397fdd18b4802d8239e39ad174