Merge "Replace -Weverything with -Wextra"
am: 39a5c06ec8

Change-Id: I62204af80b72abccbb3fa6c3012c2a600ad12889