Merge "Fix scanning APKs from APEX installed in /data."