Backed out changeset 1aca519aec7e (bug 911574) for Android robocop failures on a CLOSED TREE