Merge "Revert "Allow -Wformat warnings before they are all fixed.""
am: efa3988e10

Change-Id: I9324245aaf5a182670399c806ad66f8dff3e0559