[automerger skipped] Fix overriding ip configurtion with default one am: 6c61d1013d
am: 07de1385c3  -s ours

Change-Id: I30d8743325698cb8ff19c82d8badca04ae51eaf8
tree: 7d8fba327c516746ce54f551a54077f016febe41
  1. service-t/
  2. Android.mk