tree dd0e18e8aac4a2420736b467a383e2e590f81b72
parent eb64bfb3e75aa8a9f89402d7b710d6fb0e9d8e13
parent f06deab0de8db35737de0c8e24e676e57650bcb1
author Neil Fuller <nfuller@google.com> 1560961028 -0700
committer android-build-merger <android-build-merger@google.com> 1560961028 -0700

Merge "Remove unnecessary files from target test env" am: 30b72dca61
am: f06deab0de

Change-Id: I6c089879ecf2376e968751df24287190c2759646