Merge "Replace -Weverything with -Wextra"
am: eb8cccf772

Change-Id: I27b0e534025e10bf4d81e2e11f3a8434c2a92933