Merge "Merge "Small refactoring of field/method access checks." am: 209b4c7141" into stage-aosp-master