Backed out changesets 4fee6e1f1ad2 and f5db0dae1434 (bug 1075644) for Android 2.3 robocop failures.
CLOSED TREE