am 1f2a381e: am fdc5c1f5: Re-enable ARMv7 memcpy implementation.

Merge commit '1f2a381e844abfb364af7cfc48d8a2cb1e194637'

* commit '1f2a381e844abfb364af7cfc48d8a2cb1e194637':