As a general FYI, the X3ii and X20 targets are fully integrated into the mainline and as of this morning, part of the daily build set.
As an added bonus we can also automagically patch the stock factory images (but only on Linux).
I still need to write up a proper wiki page for these targets with instructions and some pre-patched firmware images.