cm-10.1-q2k-bkn minimal fixup (part 2 of ?)

So repo doesn't like having more than one <manifest> element in a manifest.
(Same error message as last time.)

This approach to combining two manifests, *if it works*, will basically be
lazy -- where "lazy" is a synonym for "less prone to human error".