am e0415214: am 50cb76f5: Rename ro.monkey to monkey.running

Merge commit 'e0415214c82d6f648b8939ffbf88b7dee9aca1ee'

* commit 'e0415214c82d6f648b8939ffbf88b7dee9aca1ee':
  Rename ro.monkey to monkey.running