Merge "monkey: Use java_binary" am: 4b4bf9f755

Original change: https://android-review.googlesource.com/c/platform/development/+/1699169

Change-Id: I6c89aa3fde6ae33f9005ba8a96c2c0945c9720bb