Commit b5b47cba had unintended changes for Cts*.xml package generation. Rolling back pending investigation. Bug: 15383757 Change-Id: I17ab717db400b7ebb85e004362f72ee85a063586