Merge "Get rid of indirection when adding module directories in build" am: fb175316d0...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 18:30:34 +0000 (18:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:30:34 +0000 (18:30 +0000)
am: 56687324bc

Change-Id: Ife161ecc6aab6f3e064ae2776cd82bd48ba2a7be


Trivial merge