Merge "Remove pre-ICS crap." am: 61aa5ecc0e
am: ce0afbcefd

Change-Id: I123e26c9a3f436a45b8a2d9b0028314ec8b35abb