Merge "Add definitions of GMOCK_RESULT_ and GMOCK_ARG_" am: 71650dd6ba

Change-Id: Idfe0937e899a366d04871145fde88429feb458cf