Merge other top-level C code

Change-Id: I0ff77f51595599cc3de5183c6c655fd261e3d925
3 files changed