Merge "Replace -Weverything with -Wextra" am: 8c63655c3d
am: 1ec7613f7f

Change-Id: Ifbcfef69c7ac630dabf6f8b84dd6e35516df9b99