Merge "Fix checking for subdirs when parsing apks"