Merge "Remove autogenerated pom.xml_base"