DO NOT MERGE: Heap buffer overflow in xmlAddID am: 188e4b51 -s ours am: da148074 am: ce2a7a6f -s ours am: f33d4022 am: faea71fd am: 1b65eea9 am: e66bb5b0 -s ours am: 4d4b0298 am: f9e4a758 am: afff9335 am: 39b86a2b am: b7ac692e -s ours Change-Id: I9e37cae7ceddf95cde4f010e9614845ac5718584