Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am: 75c6b8c324 am: 9958eb7180 am: 5e92ece8c2 am: 77decadefe am: 11b3161c41 am: 5cbd448348 am: a9fae33c11
am: 05f59b1f1d

Change-Id: I5382ba916ec72d4ecb519dac5a89bce35947738f