fix derps
linaro fixes
made row buildable

Change-Id: Iac48d9617463cbdda21621506150303c56092da5