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

Change-Id: Ief792b3ff9daeba4daa1f3ee994a177eee3c0aba