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

Change-Id: I57022558da811595b896d69c99bea54c41fc8d29