Bug 919812 - Remove avds code. r=dustin