Merge "Make memcpy memmove"
am: 2bf96b73bb

Change-Id: I9a76b7ba094702d1dcf756dc9d3362ff2e95ff21