Merge commit 'e87ebb08fba88628a65eae88fc5bc7911cfa7d97' into gingerbread-plus-aosp * commit 'e87ebb08fba88628a65eae88fc5bc7911cfa7d97': Cleanup Netd to prevent getting hung.
Merge commit 'e87ebb08fba88628a65eae88fc5bc7911cfa7d97' into gingerbread-plus-aosp * commit 'e87ebb08fba88628a65eae88fc5bc7911cfa7d97': Cleanup Netd to prevent getting hung.