Merge "Merge "Fix a memory corruption (NativeCodeTest testPipeReadV)" into oreo-mr1-cts-dev am: bb49e7c57d" am: 86f983c4d9
am: acc8cff383

Change-Id: Iafb119d66a44a1c58ee2bd92e3c4755e5fddaf6c