Merge "Remove path from hidl_package_root."