am f1a8c8c5: Merge "Fix up a few callers of GetTypeAndDevice."
am f1a8c8c5: Merge "Fix up a few callers of GetTypeAndDevice."

* commit 'f1a8c8c5de090221615bf1934e82e1fa9afc54b0':
  Fix up a few callers of GetTypeAndDevice.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build