am d29fb9d5: Allow Uppercase and Dashes in Build.DEVICE

Merge commit 'd29fb9d5f2482c639b687983aebe7e3b1c4499dd' into froyo

* commit 'd29fb9d5f2482c639b687983aebe7e3b1c4499dd':
  Allow Uppercase and Dashes in Build.DEVICE