Merge "Update deps for rmtypedefs and mkstubs."