Merge "Replace more -Weverything with -Wextra" am: 81a9b2c7e3
am: e2d1a47949

Change-Id: I7ce2cce274347e9fe2546c18bbf52cd0629c9d9f