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

This requires support for "port" intent extra from Android
ServiceStarter.

Bug: 23429375
2 files changed