[automerger skipped] Merge "emulator: remove vintf and some whitelists" am:...
[automerger skipped] Merge "emulator: remove vintf and some whitelists" am: 3c923018 am: 4febe1e5
am: dac4bb37 -s ours
am skip reason: change_id Ie204f22de49f0593a067f8cb52d3dea371fd2e13 with SHA1 4d2511e0 is in history
Change-Id: I97f2bbfca628d593b6a73c760c9725d9324ab1d5