Merge "Audio HAL: More generalization for types imports"