Merge "Adding v2 of audiocontrol hal"