am 36c051c7: am a695cbc9: am 0fe27cf5: make android_id random seed depend on time as well as ro.serialno

Merge commit '36c051c717391afe12a1fe8163960286175f2f7e'

* commit '36c051c717391afe12a1fe8163960286175f2f7e':
  make android_id random seed depend on time as well as ro.serialno