Merge "Activate apexes in /system_ext/apex, /vendor/apex" am: 5f28d3c732

Change-Id: Ic3c9c22ac0167c445cac52fd05a1fe2d52d7b9cd