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

Change-Id: Id8fcdf026bc41b94a3050d9d261b41cbb97a38e5