Merge "Get rid of indirection when adding module directories in build" am: fb175316d0...
authorPyry Haulos <phaulos@google.com>
Tue, 27 Sep 2016 15:58:05 +0000 (15:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Sep 2016 15:58:05 +0000 (15:58 +0000)
am: 54b623bd05

Change-Id: I8f5a625267cf394a9371e8b135665f9d1e748ba5


Trivial merge