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

Change-Id: I80bb4983a7e5386c59856580b5bdee5092483e35