Improve Java reflection for 32-bit versus 64-bit differences.
am: 53f1c10388  -s ours

Change-Id: I47f255bfda116fa5bc6e3e891e61b0d263c91de7