Backed out changeset c4ecd64d8b95 (bug 1065306)
Backed out changeset aa8972afcbe5 (bug 1065306)
Backed out changeset 7a1c2d387052 (bug 1065306)
Backed out changeset cc4d456a02e7 (bug 1065306) for breaking Android nightlys
Merge m-c to ash