Backed out changesets 6be352955252 and 1bc459138617 (bug 770840) for Android nightly bustage (bug 870782).
CLOSED TREE
Merge birch to m-c. IGNORE BAD COMMIT MESSAGES
Merge m-c to birch.