Merge "Replace -Weverything with -Wextra" am: eb8cccf772 am: adf38dff62
am: cf935ef0a3

Change-Id: I8e17bcbc4a9ba0884c6b396c8a8ae25c0caddd09