Fix non-generic references to ArrayList

This patch adds the proper type specification.

Change-Id: I2482a37cc7517e2a08846f8401a9d0104bebea3f
Signed-off-by: Robert Varga <rovarga@cisco.com>
Fix a non-generic reference to Comparable

Fixes a warning stemming from not specifying the object type.

Change-Id: Ic7e833223246d56a95034ef84a1e012fa544a396
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge changes Ic7e83322,I2482a37c

* changes:
  Fix a non-generic reference to Comparable
  Fix non-generic references to ArrayList