USB-SERIAL-FOR-ANDROID:  Changed file as upstream repository restructured.