Merge "Fix minor bugs which prevented methods from loading correctly." into dalvik-dev