am afcbb78d: Check Build.SERIAL for Non-telephony Devices

Merge commit 'afcbb78d5d182046c97b0370bec3259d8d4530c5' into gingerbread-plus-aosp

* commit 'afcbb78d5d182046c97b0370bec3259d8d4530c5':
  Check Build.SERIAL for Non-telephony Devices