Merge "Rename to HalManifest.getHidlInstances"