am b9c472e4: Fix setting memory corruption in osRgstry.c

Merge commit 'b9c472e425a823df929150475a9f340ad4decca3' into eclair-plus-aosp

* commit 'b9c472e425a823df929150475a9f340ad4decca3':
  Fix setting memory corruption in osRgstry.c