Merge "qahw_api: fix compilation error"