Merge "Remove unused system/extras/brillo_config/Android.mk" into main