Fix gp_resolve_item_override for blueberry_osgi
Simplify gp_resolve_item_override for blueberry_osgi