Merge "Audio HAL: Add missing device to XSD" am: 128f565f0f am: 1c6996eda8
am: e6787eee61

Change-Id: I8a3bf367910b1c1921f83c793c9bf2ab0d576a5e