Backed out changeset 90f4975ba986 (bug 879172) for Android bustage on a CLOSED TREE.
Backed out changeset 1591609139fd (bug 881841) for asserts on a CLOSED TREE.
Bug 879172 - Recognize a device as Sony as soon as its Manufacturer string contains Sony as substring - r=joe, CLOSED TREE