Upgrade python/mock to '3.0.5' am: dce72b5992 am: 3f7fafaa6e
am: bd0ceb45dc

Change-Id: I036efddf316cf91f969e51f9f13161843d248d5c