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

Change-Id: Ib5b2c71ed95f6fd79f0b851e9d894f2387ed6721