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

Change-Id: I7c5fec41bd74e19bffcdcbb6a096197f365936a4