Merge "Merge "Fix a memory corruption (NativeCodeTest testPipeReadV)" into lollipop-mr1-cts-dev am: a5179a03cc" into marshmallow-cts-dev