Attempt to automatically identify data/media devices

Change-Id: Ia3007fbced9ce3bc94efdb3dacc582a5e68a49a4
Merge remote-tracking branch 'omni/android-4.4' into android-4.4