Make our yaml files compatible with libyaml

Change-Id: Ie336c6f086f27dc9b92df016149902e08b021707