Merge "Removing $(PRODUCT_OUT)/root/root"