Backout changeset 120a29c1b1c9 (bug 850332) on suspicion of Android M8 orange
Backout bug 658909 for Marionette bustage.
Merge backout.