Merge "Fix regression: skip verification for apks in /system"