Merge "Allow ignoring return values when checking if class is mockable"
am: e91c337d41

Change-Id: I36ae2c2f4755810bfbaf06d30e20c1461106aa06