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

Change-Id: I6ef1ccdbca4d74f44a568c10c90bfaa53085dc90