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

Change-Id: I47573b8dd0afab4418f89f8834cf0e94ab7db637