Merge "Make HWC_MODULE_API_VERSION fit in uint16_t again" into jb-mr1-dev