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

Change-Id: I937726d02392847b35fc55761a727712a85eb112


Trivial merge