Backed out changeset 8d663f978a22 (bug 960746) for Android 4.0 robocop perma-fail. a=backout
Merge m-c to fx-team. a=merge