Merge "Make memcpy memmove" am: 2bf96b73bb
am: 14fb3aeea6

Change-Id: I508d762f873570ba48579465cfa0c8fd9d5bc47f