Merge "Fix dex location filtering in dex2oat"