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

Change-Id: I1fd9dd6f8326ab7077c62fccde6dc508a971db3e