Back out 710b11cd8e47 (bug 1016086) for Android robocop bustage