Merge "Make CompatConfig be package private." am: 688b3aea7c am: eec638dada
am: 57d083db3b

Change-Id: I53846ae6444b539f3955df33c586a22c6f4e79f1