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

Change-Id: I4fb2f20ad4391915fe4ea734158274af5e879e10