Merge "Convert hostsidetests/net/**/Android.mk file to Android.bp"
am: 9bca8f5c35

Change-Id: I45955562531b79d6601422d0d246fdbcad14bba3