Merge "Rename exported_dalvik_prop to dalvik_config_prop"