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

Change-Id: Ifcc5b6ad4f9fb75376b4cc2f4e8e76d65b70a98a