Merge "Make VariableHandleScope consistent between 32 & 64 bit" am: bae0758bef
am: 6c2d8032e8

Change-Id: Ibbcc19b0c9e71f8543d04a7b637557f6f3585025