Merge "Simplify IWeaver mocking code." am: d5dc5a7168
am: a64d04f5fe

Change-Id: I72b1e82c8bbb9cd68264d102cc268c51da1a645f