Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev
am: 7bd25ab485

Change-Id: I0266e2fe129ac5ae0c7bbd84e7890d5c41872655