Merge "Simplify IWeaver mocking code."
am: d5dc5a7168

Change-Id: Ic5c39741a218806b127b26870b796fc204dc639a