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

Change-Id: I995439ed2dce974e6f0d93ae416a2ba42ee12b3f