Merge "Use -Werror in frameworks/base"