[automerger skipped] emulator: enable vendor boot image am: 4d6f4f6c9e -s ours

am skip reason: Change-Id I258b69bd0cdc4fb0a99b1a04567051e8d32c389a with SHA-1 8fd437c80a is in history

Change-Id: I8fe3c4dd689d030e86c48528ababee9ab6ef4af4