Merge "Fix security bug: collect certs for non-systemDir apks."