merge hifi and iran crudely
remove extra [org <offset>]
Added missing semicolon after symbol
build system per hifi's specs