Merge "monkey: Use java_binary" am: 4b4bf9f755 am: 914371f674

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

Change-Id: Id9c03a3ccf560d80255c76a7272db73683533558