Re-raise exception using six

Using six.reraise() to re-raise an exception makes it compatible with
Python 2 and 3

Closes-Bug: 1351973
Change-Id: I11d1ce35794f2c6cfebafe5211ab8d880c4a826c
Merge "Re-raise exception using six"