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

Change-Id: I7c26fbf26de998be0eac81ff62c0ebffa31553ad