Merge "Builder remove *.a before building a new one"