Merge "allow pixel_vendor to find hwservice"