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