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

Change-Id: I07f53b89d124dd35e218641baa724bd1f9520d50


Trivial merge