Merge "libion: convert a header file using update_all.py"
am: 4d89dc0f54

Change-Id: I39a6a7e9ae33b85caa718a68defe4d6f429d68ed