Merge "Build system cleanups"
authorPyry Haulos <phaulos@google.com>
Tue, 3 Feb 2015 19:35:27 +0000 (19:35 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 3 Feb 2015 19:35:28 +0000 (19:35 +0000)

Trivial merge