Add the six module dependency

Change-Id: Ie57c4e8bad2934acb5217a88713099374c20dde9
Closes-Bug: #1333872