Merge "Fix selection of wrong compiler-specific path."
authorJarkko Pöyry <jpoyry@google.com>
Tue, 10 Mar 2015 22:09:17 +0000 (22:09 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 10 Mar 2015 22:09:19 +0000 (22:09 +0000)

Trivial merge