Merge "Keep all nativeLib specific data in one place."
authorJarkko Pöyry <jpoyry@google.com>
Wed, 11 Mar 2015 20:04:29 +0000 (20:04 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 11 Mar 2015 20:04:29 +0000 (20:04 +0000)

Trivial merge