Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am: 75c6b8c3 am: 9958eb71 am: 5e92ece8 Change-Id: Ia4a0127a904516fc6eeaccf318f3fb9f4de0e7f9