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

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