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

Change-Id: I81e865ee822fecd6622cfe9806ae79812b411377