Revert^2 "Make opaque-jni-ids:swapable more efficient" am: bc19b7559e
am: 642af13b1b

Change-Id: Iae7f6733190aabc616f72188a2da16ad130dee29