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