Fails when a method is duplicated (see test 097-duplicate-method) Bug: 22858531 This reverts commit f7fd9702. Change-Id: Ib30ae5be00cc568e799290be6b3c8f29cbbe4c20