am 27517b21: Still use ro.monkey

Merge commit '27517b2158a7fcdae13ff02d4cbefa79afbdb838' into eclair-plus-aosp

* commit '27517b2158a7fcdae13ff02d4cbefa79afbdb838':
  Still use ro.monkey