Merge "configs: conditionaly add modules compiled using Android.bp"