Merge "Speed up ContentProvider.query() in simple case by ~30%"