Merge "Connectivity OWNERS: let owners modify Android.mk"