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

Change-Id: I431827a383e6d7bc088336f00e0794ed7af2d143