[automerger skipped] Merge "Merge "Convert Android.mk to Android.bp for net cts" into qt-dev am: 10b4eaa6f0 am: b79fde8f7c" into qt-r1-dev-plus-aosp
am:0dfb085a03-s ours am skip reason: change_id I5bb6de7a07494bd13d069212223691968d4f080e with SHA1db29b055d9is in history Change-Id: Ie03bc15d25b8292212a84790d51449015b247e43
This commit is contained in: