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