Merge "Fix Development app to use netd for routes" into honeycomb-LTE