Merge "Include gki.h to get correct function declarations." into mnc-dev