Merge "Singleton build rule for merged compat config."
am: ac65c69913

Change-Id: I52067dc0e6a718473ab3914bc0b96d822d6a4d5e