test fix for flo device tree

Change-Id: I207b75ae101af5d8249a3126105fb2c9fb19c309

Conflicts:
	BoardConfigCommon.mk
	aosp_flo.mk
	device-common.mk
	init.flo.rc

Signed-off-by: DHOMD <DHO@dho.im>