Merge "contexthub: Pass target API version in new fields" into oc-mr1-dev

    // Data from the nanoapp header is passed through HIDL as explicit fields,

    // but the legacy HAL expects it prepended to the binary, therefore we must

    // reconstruct it here prior to passing to the legacy HAL.

    uint32_t targetChreApiVersion =

        (appBinary.targetChreApiMajorVersion << 24) |

        (appBinary.targetChreApiMinorVersion << 16);

    const struct nano_app_binary_t header = {

        .header_version = htole32(1),

        .magic = htole32(NANOAPP_MAGIC),

        .app_version = htole32(appBinary.appVersion),

        .flags = htole32(appBinary.flags),

        .hw_hub_type = htole64(0),

        .reserved[0]    = htole32(targetChreApiVersion),

        .reserved[1]    = 0,

        .target_chre_api_major_version = appBinary.targetChreApiMajorVersion,

        .target_chre_api_minor_version = appBinary.targetChreApiMinorVersion,

    };

    const uint8_t *headerBytes = reinterpret_cast<const uint8_t *>(&header);