Merge "Don't preopt system server apps in system_other."