Merge "Add configureRpcThreadpool to java interface" am: d8dab11547
am: 791a698a6a

Change-Id: I9b98013a894aa01268ed69a14c6b425e04771936