Merge "Start zygote with -Xopaque-jni-ids:swapable"