Add Emulator targets that track aosp/master