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

Change-Id: I3df03e37b17e5c23d48da8bb08c6416c4d16798b