Brings back ContactsListActivity back to feature parity with donut (with a couple exceptions).

The exceptions are:
        -Groups have yet to be implemented.
        -MODE_QUERY_PICK_TO_VIEW is still commented out. We
         probably won't need to support it, but we'll leave it in until
         we're sure.
diff --git a/src/com/android/contacts/ContactsUtils.java b/src/com/android/contacts/ContactsUtils.java
index 014a15a..0bba75c 100644
--- a/src/com/android/contacts/ContactsUtils.java
+++ b/src/com/android/contacts/ContactsUtils.java
@@ -155,13 +155,13 @@
      * @param options the decoding options, can be set to null
      * @return the photo Bitmap
      */
-    public static Bitmap loadContactPhoto(Cursor aggCursor, int bitmapColumnIndex,
+    public static Bitmap loadContactPhoto(Cursor cursor, int bitmapColumnIndex,
             BitmapFactory.Options options) {
-        if (aggCursor == null) {
+        if (cursor == null) {
             return null;
         }
 
-        byte[] data = aggCursor.getBlob(bitmapColumnIndex);;
+        byte[] data = cursor.getBlob(bitmapColumnIndex);;
         return BitmapFactory.decodeByteArray(data, 0, data.length, options);
     }