Merge "ART: Change return types of field access entrypoints"