Merge "Revert "Import updated Android SetupCompat Library 507643535""