Merge "Activate apexes in /system_ext/apex, /vendor/apex"