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

Change-Id: I52006f1cacd2f1c020c56eae70acd09ac07a37ff