Merge "add --headless mode" into cm-10.1 (koush)

Change-Id: Ica1d623df2c2e5e71a3a3eee3280a0d65ced2ca4