Upgrade hk2 to latest version

Change-Id: Ibd544ab789048c84c0fafea81e54faa9f8a48d58