Merge "Various dx fixes to make it preserve locals and debug info." into dalvik-dev