Merge "Replace -Weverything with -Wextra" am: 39a5c06ec8 am: cc888a22b9
am: 877f6b8bf4

Change-Id: I5b4a486d376ea768efc88d53fac4d3c830e435ef