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

Change-Id: I22f1cd52a728eb56a1c569f56e08a2c4e22209ed