[nobug] Update tests for executing under Java 11Change-Id: Ic22bb2be20ea51d242ee47a36cafbbceac27d12eSigned-off-by: Nitin Dahyabhai <thatnitind@gmail.com>