am e8909e5d: am 816391ba: Fix cts-tradefed\'s Java version check.

* commit 'e8909e5d660a0208095a972ab2b4ab943deeced3':