Merge "Use -Werror in frameworks/base/tools/streaming_proto"