Backed out changeset 0b84a9bee07a (bug 937429) for Android test_videocontrols_standal...