am ced87aed: Merge "Convert mEntries -> entries, fixing the build." into jb-mr1-dev-plus-aosp

* commit 'ced87aed0e1e18e7d47a998d153ae405e7028eb8':
  Convert mEntries -> entries, fixing the build.