Merge "Update AppDataDirGuesser for BaseDexClassLoader"