Merge "Add header that declares memcpy()" am: 0fe1b4bd8c
am: f31a8d1ef1

Change-Id: I39adc58d41c3242d149bb9c6f2c9a00f5947a5ab