Change-Id: I1e7eda073906f5b289317d307358a63aca2c24dc
118568: switch to using ucpp Patch contributed by Juergen Schmidt http://svn.apache.org/viewvc?view=revision&revision=1209396