Merge "Make remove_dir_all available to product and vendor am: 32e2e1e61e am: 81a62677ea am: 63ce1f5359 am: 8729a77e68 am: fc356c5596"