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

Change-Id: I1c2fd60a67f0f964b98c3049de26501cdf271c73