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

Change-Id: Ib86634f5ac9934cc513d9c3572d4b16216f1d897