Merge "Bug fix for rsubs being improperly generated." into dalvik-dev