Merge "Delete external app dir on app uninstall with FUSE" am: c3323c7d1b am: f32fa062ee

Change-Id: I40ccd8d29e79f7490cf0798d26c780508e44f0a0