Merge "Start zygote with -Xopaque-jni-ids:swapable" am: 34bc0deb01
am: 3388ace5f7

Change-Id: Ic24bcf8f4a9f0f683a07ca4905c61b250c444930