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

Change-Id: Ib8f2b2bf336dc1f9939e6cc77400105ea717267f


Trivial merge