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

Change-Id: I8c2fd9f5e060fabe7fe5bc4e628f62d9de2f4769