Merge "Conservation of newlines in libdex." into dalvik-dev