am bb3228c2: am fa63af34: am c81abd9a: am 1d19dc58: am beda6e2b: Merge "Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."" into mnc-dev

* commit 'bb3228c2d9e38ec727cc0c48407b068427e26b72':
  Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."