Merge "Add METADATA to chromium-trace: contains GPL=RESTRICTED" am: fc2ec850fa am: fe6a5051c8

Change-Id: I22d17e1d7b5db1e8451b6754a652e7069378f3f1