[automerger skipped] Merge "Replace more -Weverything with -Wextra" am: 81a9b2c7e3 am: e2d1a47949
am: b811c3c710 -s ours
am skip reason: change_id Ia3935fa155eac7777269ed3b97e74bc869fb58a4 with SHA1 a6a7eab734 is in history

Change-Id: Ic0db8db9a3f8ff56ae99b41f9136701698fb23eb