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
tree: f286cd1e99f079be5010b380ae90001cc1a56f72
  1. tests/