Backed out changeset d27425f46c14 (bug 869123) for robocop-2 failures.
Backed out changeset 760499cbe81d (bug 848317) for robocop-2 failures.
Backed out changesets 3c08a0d87dc5, b6147b141643, and a38ef60582d9 (bug 874689) for Android build bustage.
CLOSED TREE