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".
tree: eb9bacb58a27b279156a042618d36df045794a1d
  1. 60xx/
  2. 6515/
  3. 65xx/
  4. Android.mk