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

Change-Id: Idefb6d670d897a046ea19403bc5b333aa9ab9027