Merge "tests: Pick up testdata with LOCAL_TEST_DATA." am: 6b6c21af28 am: 8028dc1ce4
am: 08d3e83822

Change-Id: I53552e36aeb5fae30ff774d6e19d527e2c6000dc