Merge "Allow dx to properly generate sub-const and rsub-const insns." into dalvik-dev