- Fixed bug in selection of raw output
 - Aligned the raw output format

Change-Id: Ia9de278afd4d972b04722abddca1a90fd0e9536b
Signed-off-by: Tim Hall <tim.hall@arm.com>