Merge "HidlUtils: remove temporary conversion functions"