Reverted backout of 57f5dbea9d24
Issue 1384 - Update adblockplus dependency to revision 7313f49c65e3
Issue 1385 - Update buildtools dependency to revision 361852d2ae36
Backed out changeset 5d21c1d80ecb (premature, going to break checkouts)