Realign flo device tree with AICP

Change-Id: I8dab85b7abcfc1f6f526fcdec93ddfb099215482
Use sm-4.8 for kernel

Change-Id: I529d55f601ad8ebe2fe466bbc2e0a9b3dbe8ffd9
Revert "Use sm-4.8 for kernel"

This reverts commit 59fe362838c5d58ef8a10837a33a9032c5a9d9ba.

Change-Id: I56670920cbb7c0e06d4e2ebfc6b6a90a0d4d7b34
Revert "Realign flo device tree with AICP"

This reverts commit 149544a2968378e45de06851561fc42db8c68126.

Change-Id: Icebcd050f0290a6dcd3f1da5cac416aba4a4f284
Merge remote-tracking branch 'upstream/kitkat' into kk