Merge changes from topic "QQ3A.200605.002_merge"
* changes: Convert Android.mk to Android.bp for CVE-2018-9536 Merge QQ3A.200605.002 into master
This commit is contained in:
* changes: Convert Android.mk to Android.bp for CVE-2018-9536 Merge QQ3A.200605.002 into master