Merge "Convert Android.mk to Android.bp for net cts"
am: b2ba69080c

Change-Id: Ib06cf43d108e74a52c539e9113a2ea6f9937a8c2