Revert remove samsung debugging

Change-Id: Ibc175e7e35f8b198a861e0e49bf4d847e15e454c