am 18ab90f1: am ece40ff8: Merge "Fix "error: \'memcpy\' was not declared in this scope"."

* commit '18ab90f13c059813229a36194d798e5e1b74e679':
  Fix "error: 'memcpy' was not declared in this scope".