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

Change-Id: I7360365bd640dc1b420b940cd644e69997090eba


Trivial merge