Merge "Expose cmd's functionality as a static library." am: 47a389f2ac am: a98ad027d0
am: 481a665590

Change-Id: Ic015ccffa827fc00e410afade36a0e364872f3eb