Revert "Make opaque-jni-ids:swapable more efficient" am: 42c52f53b3
am: eac66af0b8

Change-Id: I1fa7a6d5d24a6198fafb267cd9fbcc24f667d297