Merge "[MultiDisplay] Convert the Android.mk to Android.bp"