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

Merge commit 'a695cbc94355017d02a3a6c17d866776a8eee24c' into gingerbread-plus-aosp

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