Make opaque-jni-ids:swapable more efficient am: 4e7dd70e3e
am: 7c90e524e3

Change-Id: I66716b57372526c74c79fbfdf361fe770bcad2a8