Merge "Use TargetPort for both host- and device-side ports on Android"