Merge "Refactors VtsHalContexthubUtils.h"