Merge "Replace MOCK_METHODN with MOCK_METHOD macro."
am: 3902531b86

Change-Id: Ic24d31f2407d13ce27741d4fd13632e00029fbd1