Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am: 7bd25ab4 am: a045aed7 am: 846f64c6 Change-Id: Id2d5000722d160df14dd33aa937a36388b971b76