am fd119e4b: am ef15cd61: am 3195ff0a: (-s ours) am b90db3e6: am de3b2c06: am 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE]

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