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

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

Change-Id: I5c4a960756ba710fd1e70294f0f10414f87113bf