Merge manifest kernels.

Merge manually written device manifest with kernel
FCM version with auto-generated device manifest from
kernel version / configs.

Test: libvintf_test
Bug: 139309488
Change-Id: If7ae8232461eec9fcc83b03194353db953ce087d
6 files changed