Improve Java reflection for 32-bit versus 64-bit differences. am: 0730cbcaec -s ours Change-Id: I3e4123b31bca5a324767e5d106f7cb9e864b0821