Still use ro.monkey

http://b/issue?id=1681101
So just some refactoring.
5 files changed