b4fc9b4bc9
This patch set removes some commented out stuff that has been unintentially left in "H302 check" patch set. It also replaces a couple more method imports with module imports. Fixes bug 1215892 Change-Id: I35fd880154a4ea6d6d8d3b3615103c271aa4a005