am 23113831: Merge "check invalid file offset when loading library"
authorYabin Cui <yabinc@google.com>
Wed, 5 Nov 2014 20:12:36 +0000 (20:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 5 Nov 2014 20:12:36 +0000 (20:12 +0000)
* commit '2311383180aee9388d28b03901a1e4ef021bcfa7':
  check invalid file offset when loading library


Trivial merge