Merge "Convert Android.mk to Android.bp for net cts" into qt-dev
am: 10b4eaa6f0

Change-Id: I12ef42f346d67fbb249bff1021a4f5c8b37ecdd3