Merge "Rename matcha.ld and add OSS headers."