Merge "Add new AVD test." into emu-master-dev