Merge "Import updated Android SetupCompat Library 515497412" into udc-dev