Fix derp

Looked like some sort of merge conflict marker <<<<<<<<< etc...
Revert "Remove qrngd"

 * Bring this back. It improves boot time on several devices. The
   built-in seeder is oneshot.

This reverts commit 89b023b691148d299bed54b5c4807cfb72e61a4f.

Change-Id: Ic9e272b7a5d797d06e9a3109328ef6aa0a13b172
add back cm trebuchet

Change-Id: Id7f52a371aee4d52c91b132736bb6552c58111b0
Signed-off-by: scott <scott@ubuntu>
Merge remote-tracking branch 'upstream/kk44' into default