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

Change-Id: Ib2d509d96e7edd40a54cbf16049bf4ebb3b3a469