Merge \\"Add tests for varying linking by location\\" into nyc-dev am: 74079c6d92
authorPyry Haulos <phaulos@google.com>
Mon, 13 Jun 2016 21:56:29 +0000 (21:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 13 Jun 2016 21:56:29 +0000 (21:56 +0000)
am: a3ba6e71af

Change-Id: I3dfdfe325c4117212c581de5db445df805143cc1


Trivial merge