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

Change-Id: I2d999ea397101315068ac1c63dff9a7ec6445453