Merge "Moves all compatibility flags to ConnectivityCompatChanges.java"