Merge "Convert Android.mk to Android.bp for CVE-2018-9536" into rvc-dev