Cleanup AAE Emulator configs
am: 549fe1dd28

Change-Id: I1cf520c55541718f1f911d78ab0fbb30c405967f