am 80c668f2: Remove references to non-std Java classes. [DO NOT MERGE]

* commit '80c668f2a076e91d887dbf77776cd503ff88b0b4':
  Remove references to non-std Java classes. [DO NOT MERGE]