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

Change-Id: I312af316dab125c356a19e7fc59ea9169ac26ba5