Merge \"Make java 8 run-tests runnable on the RI again.\"
am: 659ad8fe6b

Change-Id: I73852191af8517db26adf0f7b744441853c05187