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

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