Merge "Resolve several style issues in decode_perf_test"