packages/apps/Terminal: use proper nativehelper headers am: 8ba8c509c8 am: 6ef2b729b4 am: 70f8a07a4e
am: dc88e90a2b

Change-Id: I8e1111ffe6c5d87578b2ad01acdb2258b59b1dd3