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 am: ec69d20c3d
am: 3fca84af72

Change-Id: I0421d05926630b03f75bb6c37884bcae7c5ffa90