Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am: 75c6b8c324 am: 9958eb7180 am: 5e92ece8c2
am: 77decadefe

Change-Id: I41f78ad8e6d669cb1e038480adfd9d12a469500c