Merge "Zygote: Allow arbitrary-length wrap property names" am: 11780f1ad3
am: c942ae61e9

Change-Id: I06a030f61b15aae3bb971c5f5666c940592f48e0