Merge "Refactor audio device type in audio frameworks." am: dd2c24061d
am: 13d789d480

Change-Id: Id30c38a272831566a02680cff43072a45376b61d