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

Change-Id: I871421b4ba8b8a749c164ba059d823a4fbc6de7c