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

Change-Id: I6d4930bb76c607868d21928d49d44e08f578a875