Revert Cls stopping now-master running on googlefood

This reverts commits 01453e855f.
and 242bbe1b72.
"Add content description to bagded icons."
"Remove reflection now we are building against L"

Bug: 15833449
Change-Id: I81a5316f5619a9cd3b6ab9fd03b2ba96657b7f68

src/com/android/launcher3/ShortcutInfo.java

@@ -113,12 +113,10 @@ public class ShortcutInfo extends ItemInfo {
         }
     }
 
-    ShortcutInfo(Intent intent, CharSequence title, String contentDescrition,
-            Bitmap icon, UserHandleCompat user) {
+    ShortcutInfo(Intent intent, CharSequence title, Bitmap icon, UserHandleCompat user) {
         this();
         this.intent = intent;
         this.title = title;
-        this.contentDescription = contentDescription;
         mIcon = icon;
         this.user = user;
     }