am be451b57: Merge "Fix the arguments to memcpy." into mnc-dev

* commit 'be451b57b97c21747c637f4af06743318d42c36c':
  Fix the arguments to memcpy.